OCPBUGS-99534: etcd initialization bugs after etcdctl snapshot restore#9048
Open
tony-schndr wants to merge 3 commits into
Open
OCPBUGS-99534: etcd initialization bugs after etcdctl snapshot restore#9048tony-schndr wants to merge 3 commits into
tony-schndr wants to merge 3 commits into
Conversation
Contributor
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
Contributor
|
Skipping CI for Draft Pull Request. |
openshift-ci
Bot
added
do-not-merge/needs-area
needs-rebase
Contributor
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughThe etcd StatefulSet now computes and reuses its initial cluster configuration, injects pod and namespace identity into the restore init container, and places Sequence Diagram(s)sequenceDiagram
participant StatefulSetAdapter
participant EtcdInitContainer
participant SnapshotTool
StatefulSetAdapter->>EtcdInitContainer: Start before reset-member
EtcdInitContainer->>SnapshotTool: Restore snapshot with explicit cluster identity
SnapshotTool-->>EtcdInitContainer: Stage restored data in /var/lib/restore
Possibly related PRs
Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error)
✅ Passed checks (10 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
openshift-ci
Bot
added
area/control-plane-operator
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go (1)
1142-1145: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low valueUse the required test-case description format.
Rename this case to
When etcd snapshot restore is configured, it should reconcile the expected components.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go` around lines 1142 - 1145, Rename the test case in the relevant test-case table from “Default feature set, etcd snapshot restore” to “When etcd snapshot restore is configured, it should reconcile the expected components,” without changing its featureSet, subDirSuffix, or test behavior.Source: Coding guidelines
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In
`@control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go`:
- Around line 1142-1145: Rename the test case in the relevant test-case table
from “Default feature set, etcd snapshot restore” to “When etcd snapshot restore
is configured, it should reconcile the expected components,” without changing
its featureSet, subDirSuffix, or test behavior.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 32129925-6bcc-42aa-afcd-854baa0dae02
📒 Files selected for processing (4)
control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.gocontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.shcontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd_test.gocontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/statefulset.go
tony-schndr
force-pushed
the
fix/etcd-snapshot-restore-init
branch
from
July 21, 2026 18:59
bee7b14 to
62eb783
Compare
openshift-ci
Bot
removed
the
needs-rebase
tony-schndr
force-pushed
the
fix/etcd-snapshot-restore-init
branch
from
July 21, 2026 19:07
62eb783 to
40ce74a
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #9048 +/- ##
==========================================
+ Coverage 44.51% 44.53% +0.01%
==========================================
Files 774 774
Lines 96997 97016 +19
==========================================
+ Hits 43179 43205 +26
+ Misses 50830 50824 -6
+ Partials 2988 2987 -1
... and 1 file with indirect coverage changes
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@control-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.sh`:
- Around line 26-40: Add fail-fast handling to the etcd-init script before the
restore branches, such as enabling errexit with set -e, so failures from either
the etcdutl or etcdctl snapshot restore commands stop execution. Ensure the
subsequent promotion of /var/lib/restore into /var/lib/data cannot run after a
partial or failed restore.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 7464c0d5-025d-49c5-b037-2d3b3165646d
📒 Files selected for processing (4)
control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.gocontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.shcontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd_test.gocontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/statefulset.go
🚧 Files skipped from review as they are similar to previous changes (3)
- control-plane-operator/controllers/hostedcontrolplane/v2/etcd/statefulset.go
- control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
- control-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd_test.go
Comment on lines
+26
to
+40
| etcdutl snapshot restore /tmp/snapshot \ | ||
| --data-dir=/var/lib/restore \ | ||
| --name "${HOSTNAME}" \ | ||
| --initial-advertise-peer-urls "${PEER_URL}" \ | ||
| --initial-cluster "${ETCD_INITIAL_CLUSTER}" \ | ||
| --initial-cluster-token "${HCP_NAMESPACE}" | ||
| elif [ -x /usr/bin/etcdctl ]; then | ||
| echo "INFO: using etcdctl (etcd 3.5.x)" | ||
| env ETCDCTL_API=3 /usr/bin/etcdctl -w table snapshot status /tmp/snapshot | ||
| env ETCDCTL_API=3 /usr/bin/etcdctl snapshot restore /tmp/snapshot --data-dir=/var/lib/restore | ||
| env ETCDCTL_API=3 /usr/bin/etcdctl snapshot restore /tmp/snapshot \ | ||
| --data-dir=/var/lib/restore \ | ||
| --name "${HOSTNAME}" \ | ||
| --initial-advertise-peer-urls "${PEER_URL}" \ | ||
| --initial-cluster "${ETCD_INITIAL_CLUSTER}" \ | ||
| --initial-cluster-token "${HCP_NAMESPACE}" |
Contributor
There was a problem hiding this comment.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
Do not promote a failed or partial restore.
This script does not enable errexit or check either restore command’s exit status. If etcdutl or etcdctl creates partial contents and then fails, Lines [46-47] still move that incomplete database into /var/lib/data, potentially causing etcd corruption or a CrashLoopBackOff. Add set -e near the top or explicitly abort when either restore command fails.
Proposed minimal fix
+set -euo pipefail
+
# If /var/lib/data is not empty we exit early, since this means an etcd database already exists📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| etcdutl snapshot restore /tmp/snapshot \ | |
| --data-dir=/var/lib/restore \ | |
| --name "${HOSTNAME}" \ | |
| --initial-advertise-peer-urls "${PEER_URL}" \ | |
| --initial-cluster "${ETCD_INITIAL_CLUSTER}" \ | |
| --initial-cluster-token "${HCP_NAMESPACE}" | |
| elif [ -x /usr/bin/etcdctl ]; then | |
| echo "INFO: using etcdctl (etcd 3.5.x)" | |
| env ETCDCTL_API=3 /usr/bin/etcdctl -w table snapshot status /tmp/snapshot | |
| env ETCDCTL_API=3 /usr/bin/etcdctl snapshot restore /tmp/snapshot --data-dir=/var/lib/restore | |
| env ETCDCTL_API=3 /usr/bin/etcdctl snapshot restore /tmp/snapshot \ | |
| --data-dir=/var/lib/restore \ | |
| --name "${HOSTNAME}" \ | |
| --initial-advertise-peer-urls "${PEER_URL}" \ | |
| --initial-cluster "${ETCD_INITIAL_CLUSTER}" \ | |
| --initial-cluster-token "${HCP_NAMESPACE}" | |
| set -euo pipefail | |
| etcdutl snapshot restore /tmp/snapshot \ | |
| --data-dir=/var/lib/restore \ | |
| --name "${HOSTNAME}" \ | |
| --initial-advertise-peer-urls "${PEER_URL}" \ | |
| --initial-cluster "${ETCD_INITIAL_CLUSTER}" \ | |
| --initial-cluster-token "${HCP_NAMESPACE}" | |
| elif [ -x /usr/bin/etcdctl ]; then | |
| echo "INFO: using etcdctl (etcd 3.5.x)" | |
| env ETCDCTL_API=3 /usr/bin/etcdctl -w table snapshot status /tmp/snapshot | |
| env ETCDCTL_API=3 /usr/bin/etcdctl snapshot restore /tmp/snapshot \ | |
| --data-dir=/var/lib/restore \ | |
| --name "${HOSTNAME}" \ | |
| --initial-advertise-peer-urls "${PEER_URL}" \ | |
| --initial-cluster "${ETCD_INITIAL_CLUSTER}" \ | |
| --initial-cluster-token "${HCP_NAMESPACE}" |
🧰 Tools
🪛 ast-grep (0.44.1)
[warning] 33-33: Writing to or reading from a hardcoded, predictable path under /tmp is vulnerable to symlink and TOCTOU attacks: a local attacker can pre-create the file (or a symlink pointing elsewhere) and hijack or corrupt the contents. Generate a unique, unpredictable temporary file with mktemp instead, e.g. tmpfile="$(mktemp)" (or mktemp -d for directories) and reference "$tmpfile".
Context: /tmp/snapshot
Note: [CWE-377] Insecure Temporary File.
(predictable-tmp-file-bash)
[warning] 34-34: Writing to or reading from a hardcoded, predictable path under /tmp is vulnerable to symlink and TOCTOU attacks: a local attacker can pre-create the file (or a symlink pointing elsewhere) and hijack or corrupt the contents. Generate a unique, unpredictable temporary file with mktemp instead, e.g. tmpfile="$(mktemp)" (or mktemp -d for directories) and reference "$tmpfile".
Context: /tmp/snapshot
Note: [CWE-377] Insecure Temporary File.
(predictable-tmp-file-bash)
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@control-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.sh`
around lines 26 - 40, Add fail-fast handling to the etcd-init script before the
restore branches, such as enabling errexit with set -e, so failures from either
the etcdutl or etcdctl snapshot restore commands stop execution. Ensure the
subsequent promotion of /var/lib/restore into /var/lib/data cannot run after a
partial or failed restore.
tony-schndr
force-pushed
the
fix/etcd-snapshot-restore-init
branch
2 times, most recently
from
July 22, 2026 15:08
c77b637 to
859b305
Compare
openshift-ci
Bot
added
area/platform/aws
Contributor
There was a problem hiding this comment.
♻️ Duplicate comments (1)
control-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.sh (1)
26-40: 🩺 Stability & Availability | 🟠 MajorDo not promote a failed or partial restore.
The previous finding remains valid: if
etcdutloretcdctlfails, execution can still reach Line [46] and move incomplete contents into/var/lib/data. Add fail-fast handling or explicit checks around both restore commands before promotion.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@control-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.sh` around lines 26 - 40, Update the restore branches in the etcdutl/etcdctl selection to fail immediately when either snapshot restore command fails, before execution can reach the promotion that moves contents into /var/lib/data. Enable fail-fast behavior or explicitly check each restore command’s exit status, while preserving the existing status inspection and restore arguments.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Duplicate comments:
In `@control-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.sh`:
- Around line 26-40: Update the restore branches in the etcdutl/etcdctl
selection to fail immediately when either snapshot restore command fails, before
execution can reach the promotion that moves contents into /var/lib/data. Enable
fail-fast behavior or explicitly check each restore command’s exit status, while
preserving the existing status inspection and restore arguments.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 73319c35-161d-469e-9fa1-cfff9f4fbdc2
⛔ Files ignored due to path filters (240)
control-plane-operator/controllers/hostedcontrolplane/testdata/aws-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_aws_cloud_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/aws-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/aws-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/aws-node-termination-handler/EtcdRestore/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/aws-node-termination-handler/EtcdRestore/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_creds_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/aws-node-termination-handler/EtcdRestore/zz_fixture_TestControlPlaneComponents_aws_node_termination_handler_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/azure-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_azure_cloud_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/azure-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_azure_cloud_config_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/azure-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/azure-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/azure-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_azure_cloud_controller_manager_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/catalog-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_catalog_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/catalog-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_catalog_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/catalog-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_catalog_operator_metrics_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/catalog-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_catalog_operator_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/certified-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_certified_operators_catalog_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/certified-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_certified_operators_catalog_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/certified-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_certified_operators_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cloud-credential-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cloud_credential_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cloud-credential-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cloud_credential_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cloud-credential-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cloud_credential_operator_service_account_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-autoscaler/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_autoscaler_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-autoscaler/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_autoscaler_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-autoscaler/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_autoscaler_podmonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-autoscaler/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_autoscaler_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-autoscaler/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_autoscaler_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-autoscaler/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_autoscaler_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-image-registry-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_image_registry_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-image-registry-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_image_registry_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-image-registry-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_image_registry_operator_podmonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-image-registry-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_image_registry_controller_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-network-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_network_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-network-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_network_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-network-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_network_operator_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-network-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_network_operator_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-network-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_network_operator_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-node-tuning-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_node_tuning_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-node-tuning-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_node_tuning_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-node-tuning-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_node_tuning_operator_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-node-tuning-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_node_tuning_operator_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-node-tuning-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_node_tuning_operator_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-node-tuning-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_node_tuning_operator_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-node-tuning-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_node_tuning_operator_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-policy-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_policy_controller_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-policy-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_policy_controller_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-policy-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_policy_controller_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-storage-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_storage_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-storage-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_storage_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-storage-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_storage_operator_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-storage-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_storage_operator_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-storage-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_storage_operator_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_version_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_version_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_version_operator_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/cluster-version-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_cluster_version_operator_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/community-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_community_operators_catalog_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/community-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_community_operators_catalog_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/community-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_community_operators_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/control-plane-pki-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_control_plane_pki_operator_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/control-plane-pki-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_control_plane_pki_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/control-plane-pki-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_control_plane_pki_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/control-plane-pki-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_control_plane_pki_operator_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/control-plane-pki-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_control_plane_pki_operator_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/control-plane-pki-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_control_plane_pki_operator_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/csi-snapshot-controller-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_csi_snapshot_controller_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/csi-snapshot-controller-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_csi_snapshot_controller_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/csi-snapshot-controller-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_csi_snapshot_controller_operator_role_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/csi-snapshot-controller-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_csi_snapshot_controller_operator_role_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/csi-snapshot-controller-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_csi_snapshot_controller_operator_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/dns-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_dns_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/dns-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_dns_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/dns-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_dns_operator_service_account_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_ca_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/endpoint-resolver/EtcdRestore/zz_fixture_TestControlPlaneComponents_endpoint_resolver_serving_cert_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_client_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_discovery_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_poddisruptionbudget.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_self_register_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_self_register_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/etcd/EtcdRestore/zz_fixture_TestControlPlaneComponents_etcd_statefulset.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/featuregate-generator/EtcdRestore/zz_fixture_TestControlPlaneComponents_featuregate_generator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/featuregate-generator/EtcdRestore/zz_fixture_TestControlPlaneComponents_featuregate_generator_job.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/gcp-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_gcp_cloud_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/gcp-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_gcp_cloud_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/gcp-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_gcp_cloud_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/hosted-cluster-config-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_hosted_cluster_config_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/hosted-cluster-config-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_hosted_cluster_config_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/hosted-cluster-config-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_hosted_cluster_config_operator_podmonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/hosted-cluster-config-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_hosted_cluster_config_operator_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/hosted-cluster-config-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_hosted_cluster_config_operator_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/hosted-cluster-config-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_hosted_cluster_config_operator_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_proxy_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_proxy_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_proxy_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_ca_cert_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_podmonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_route.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ignition-server/EtcdRestore/zz_fixture_TestControlPlaneComponents_ignition_server_serving_cert_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ingress-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_ingress_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ingress-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_ingress_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ingress-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_ingress_operator_podmonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/ingress-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_ingress_operator_service_account_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/konnectivity-agent/EtcdRestore/zz_fixture_TestControlPlaneComponents_konnectivity_agent_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/konnectivity-agent/EtcdRestore/zz_fixture_TestControlPlaneComponents_konnectivity_agent_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/konnectivity-agent/EtcdRestore/zz_fixture_TestControlPlaneComponents_konnectivity_agent_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_admin_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_auth_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_aws_pod_identity_webhook_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_bootstrap_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_hcco_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kas_audit_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kas_authentication_token_webhook_config_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kas_bootstrap_container_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kas_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kas_egress_selector_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_konnectivity_server_local_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_apiserver_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_apiserver_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_apiserver_poddisruptionbudget.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_apiserver_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_localhost_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_metadata_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_recording_rules_prometheusrule.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_service_network_admin_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kcm_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_controller_manager_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_controller_manager_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_controller_manager_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_recycler_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-scheduler/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_scheduler_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-scheduler/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_scheduler_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-scheduler/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_scheduler_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-scheduler/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_scheduler_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-scheduler/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_scheduler_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-scheduler/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_scheduler_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-storage-version-migrator/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_storage_version_migrator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kube-storage-version-migrator/EtcdRestore/zz_fixture_TestControlPlaneComponents_kube_storage_version_migrator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_cloud_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_cloud_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_cloud_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_cloud_controller_manager_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_cloud_controller_manager_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_cloud_controller_manager_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-csi-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_driver_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-csi-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_csi_controller_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-csi-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_csi_controller_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-csi-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_csi_controller_service_account_kubeconfig_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-csi-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_csi_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-csi-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_csi_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/kubevirt-csi-controller/EtcdRestore/zz_fixture_TestControlPlaneComponents_kubevirt_csi_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/machine-approver/EtcdRestore/zz_fixture_TestControlPlaneComponents_machine_approver_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/machine-approver/EtcdRestore/zz_fixture_TestControlPlaneComponents_machine_approver_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/machine-approver/EtcdRestore/zz_fixture_TestControlPlaneComponents_machine_approver_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/machine-approver/EtcdRestore/zz_fixture_TestControlPlaneComponents_machine_approver_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/machine-approver/EtcdRestore/zz_fixture_TestControlPlaneComponents_machine_approver_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/machine-approver/EtcdRestore/zz_fixture_TestControlPlaneComponents_machine_approver_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_ca_cert_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_route.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/metrics-proxy/EtcdRestore/zz_fixture_TestControlPlaneComponents_metrics_proxy_serving_cert_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_audit_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_default_error_template_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_default_login_template_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_default_provider_selection_template_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_poddisruptionbudget.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/oauth-openshift/EtcdRestore/zz_fixture_TestControlPlaneComponents_oauth_openshift_session_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-collect-profiles/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_collect_profiles_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-collect-profiles/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_collect_profiles_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-collect-profiles/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_collect_profiles_cronjob.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-collect-profiles/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_collect_profiles_role.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-collect-profiles/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_collect_profiles_rolebinding.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-collect-profiles/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_collect_profiles_serviceaccount.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-collect-profiles/EtcdRestore/zz_fixture_TestControlPlaneComponents_pprof_cert_secret.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_operator_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_operator_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_operator_metrics_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/olm-operator/EtcdRestore/zz_fixture_TestControlPlaneComponents_olm_operator_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_apiserver_audit_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_apiserver_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_apiserver_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_apiserver_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_apiserver_poddisruptionbudget.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_apiserver_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_controller_manager_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_controller_manager_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_controller_manager_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-oauth-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_oauth_apiserver_audit_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-oauth-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_oauth_apiserver_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-oauth-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_oauth_apiserver_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-oauth-apiserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_oauth_apiserver_poddisruptionbudget.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-route-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_route_controller_manager_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-route-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_route_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-route-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_route_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-route-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_route_controller_manager_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openshift-route-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openshift_route_controller_manager_servicemonitor.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openstack-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openstack_cloud_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openstack-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openstack_cloud_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openstack-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openstack_cloud_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/openstack-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_openstack_trusted_ca_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/packageserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_packageserver_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/packageserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_packageserver_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/packageserver/EtcdRestore/zz_fixture_TestControlPlaneComponents_packageserver_pdb_poddisruptionbudget.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/powervs-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_ccm_config_configmap.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/powervs-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_powervs_cloud_controller_manager_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/powervs-cloud-controller-manager/EtcdRestore/zz_fixture_TestControlPlaneComponents_powervs_cloud_controller_manager_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/redhat-marketplace-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_redhat_marketplace_catalog_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/redhat-marketplace-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_redhat_marketplace_catalog_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/redhat-marketplace-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_redhat_marketplace_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/redhat-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_catalogs_imagestream.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/redhat-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_redhat_operators_catalog_controlplanecomponent.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/redhat-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_redhat_operators_catalog_deployment.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/redhat-operators-catalog/EtcdRestore/zz_fixture_TestControlPlaneComponents_redhat_operators_service.yamlis excluded by!**/testdata/**control-plane-operator/controllers/hostedcontrolplane/testdata/router/EtcdRestore/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yamlis excluded by!**/testdata/**
📒 Files selected for processing (4)
control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.gocontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd-init.shcontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd_test.gocontrol-plane-operator/controllers/hostedcontrolplane/v2/etcd/statefulset.go
🚧 Files skipped from review as they are similar to previous changes (3)
- control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
- control-plane-operator/controllers/hostedcontrolplane/v2/etcd/statefulset.go
- control-plane-operator/controllers/hostedcontrolplane/v2/etcd/etcd_test.go
tony-schndr
marked this pull request as ready for review
July 22, 2026 16:22
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
Member
|
@tony-schndr is all the 16k lines of changes really needed to fix this bug? Could you please use the restructure commit skill in the hypershift repo to split up the changes into appropriate commits?; that would make it much easier to review. |
Contributor
|
/retitle OCPBUGS-99534: etcd initialization bugs after etcdctl snapshot restore |
openshift-ci
Bot
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@tony-schndr: This pull request references Jira Issue OCPBUGS-99534, which is valid. 3 validation(s) were run on this bug
The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
6 tasks
tony-schndr
force-pushed
the
fix/etcd-snapshot-restore-init
branch
from
July 23, 2026 12:55
859b305 to
02cbb4c
Compare
jparrill
reviewed
Jul 23, 2026
jparrill
left a comment
jparrill
left a comment
Contributor
There was a problem hiding this comment.
Dropped a comment. Thanks!
| expectedOrder: []string{"ensure-dns", "etcd-init", "reset-member"}, | ||
| }, | ||
| { | ||
| name: "When restoreSnapshotURL is not set, it should not add etcd-init", |
Contributor
There was a problem hiding this comment.
Nice test — the two cases cover the main paths well. Two additions worth considering:
-
EtcdSnapshotRestored=Truewith a restoreURL set: verifies the guard clause atstatefulset.go:136prevents re-adding etcd-init after a successful restore. This is the most critical path — if it regresses, a reconcile loop could re-trigger a snapshot restore on an already-running cluster. -
reset-memberabsent from init containers: the code falls back to append-at-end (insertIdx = len(...)), which is reasonable but untested. A one-liner case withbaseInitContainers: []Container{{Name: "ensure-dns"}}would document that behavior.
Contributor
Author
There was a problem hiding this comment.
Added the recommended test cases, thanks!
tony-schndr
force-pushed
the
fix/etcd-snapshot-restore-init
branch
from
July 23, 2026 14:25
02cbb4c to
872d837
Compare
Contributor
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jparrill, tony-schndr The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
Contributor
|
/cc @sdminonne |
Contributor
|
/rebase |
|
🤖 Rebasing PR onto main: workflow run |
Contributor
|
@tony-schndr, I went through this after @jparrill and @bryan-cox review. So I've the impression I'm late at the party. I've really nothing to say except ultra nits stuff no worth mentioning. |
|
🤖 Rebasing PR onto main: workflow run |
Fixes OCPBUGS-99310 Fix etcd split brain caused by single member initialization. - Previously etcd members were started without information about other cluster members, causing each to initialize individually. Added --name, --initial-advertise-peer-urls, --initial-cluster, and --initial-cluster-token to etcdctl (and utl) snapshot restore to ensure members are properly initialized during restore. Fix member ID mismatch on snapshot restore by running etcd-init before reset-member. - Previously, reset-member ran first and, if the cluster was already up, would remove and re-add the local member with a new ID. etcd-init then restored the snapshot with the old member ID, causing a WAL/cluster membership mismatch and CrashLoopBackOff. Running etcd-init first ensures the data directory exists when reset-member runs, so it takes the no-op "member has data" path and leaves membership unchanged. Signed-off-by: Tony Schneider <tschneid@redhat.com>
tony-schndr
force-pushed
the
fix/etcd-snapshot-restore-init
branch
from
July 23, 2026 17:12
872d837 to
6b1fa87
Compare
github-actions
Bot
force-pushed
the
fix/etcd-snapshot-restore-init
branch
from
July 23, 2026 17:28
6b1fa87 to
59c32eb
Compare
Pass --bump-revision 1000000000 --mark-compacted to etcdutl and etcdctl snapshot restore invocations so that post-restore revisions are always greater than any revision the cluster has seen, and all watches are terminated on startup. Without this, informer caches may observe stale revisions from before the snapshot was taken. Ref: https://etcd.io/docs/v3.5/op-guide/recovery/ Signed-off-by: Tony Schneider <tschneid@redhat.com>
… tests Signed-off-by: Tony Schneider <tschneid@redhat.com>
tony-schndr
force-pushed
the
fix/etcd-snapshot-restore-init
branch
from
July 23, 2026 21:00
59c32eb to
6e60bfa
Compare
Contributor
|
@tony-schndr: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Fix etcd split brain caused by single member initialization.
Fix member ID mismatch on snapshot restore by running etcd-init before reset-member.
Adds
--bump-revision 1000000000 --mark-compactedflags to etcdctl|etcdutl snapshot restore to ensure etcd object revisions are always greater than any revision the cluster has seen. This ensures that all watches are terminated and etcd does not respond to requests about revisions that happened after taking the snapshot - effectively invalidating its informer caches. ref https://etcd.io/docs/v3.5/op-guide/recovery/Which issue(s) this PR fixes:
Fixes OCPBUGS-99310
Special notes for your reviewer:
Checklist:
Summary by CodeRabbit